From: Shinjiman <shinjiman@users.mediawiki.org>
Date: Sun, 2 Dec 2007 09:02:09 +0000 (+0000)
Subject: * (bug 451) adding a generic Traditional / Simplified Chinese conversion table, with... 
X-Git-Tag: 1.31.0-rc.0~50618
X-Git-Url: http://git.cyclocoop.org/%22.%24info%5B?a=commitdiff_plain;h=c7c389848bac3eb3324ef8b2f6a623c8551dc756;p=lhc%2Fweb%2Fwiklou.git

* (bug 451) adding a generic Traditional / Simplified Chinese conversion table, with their variants
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 01d3e03ea5..077f74aa57 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -203,6 +203,9 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 12143) Do not show a link to patrol new pages for non existent pages
 * (bug 12166) Fix XHTML validity for Special:Emailuser
 * (bug 11346) Users who cannot edit a page can now no longer unprotect it.
+* (bug 451) Add a generic Traditional / Simplified Chinese conversion table, 
+  instead of a Traditional conversion with Taiwan variant, and a Simplified 
+  conversion with China variant.
 
 == Parser changes in 1.12 ==
 
diff --git a/includes/ZhConversion.php b/includes/ZhConversion.php
index 035f016820..62bebb4eae 100644
--- a/includes/ZhConversion.php
+++ b/includes/ZhConversion.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Simplified/Traditional Chinese conversion tables
+ * Simplified / Traditional Chinese conversion tables
  *
  * Automatically generated using code and data in includes/zhtable/
  * Do not modify directly!
  */
 
-$zh2TW=array(
+$zh2Hant = array(
 "画"=>"畫",
 "板"=>"板",
 "表"=>"表",
@@ -188,7 +188,6 @@ $zh2TW=array(
 "锤"=>"錘",
 "㟆"=>"㠏",
 "㛟"=>"𡞵",
-"𡞵"=>"㛟",
 "专"=>"專",
 "业"=>"業",
 "丛"=>"叢",
@@ -266,7 +265,6 @@ $zh2TW=array(
 "储"=>"儲",
 "傩"=>"儺",
 "㑩"=>"儸",
-"儸"=>"㑩",
 "兑"=>"兌",
 "兖"=>"兗",
 "兰"=>"蘭",
@@ -314,9 +312,7 @@ $zh2TW=array(
 "剥"=>"剝",
 "剧"=>"劇",
 "㓥"=>"劏",
-"劏"=>"㓥",
 "㔉"=>"劚",
-"劚"=>"㔉",
 "劝"=>"勸",
 "办"=>"辦",
 "务"=>"務",
@@ -418,7 +414,6 @@ $zh2TW=array(
 "嘤"=>"嚶",
 "嘱"=>"囑",
 "㖊"=>"噚",
-"噚"=>"㖊",
 "噜"=>"嚕",
 "嚣"=>"囂",
 "园"=>"園",
@@ -568,7 +563,6 @@ $zh2TW=array(
 "帻"=>"幘",
 "帼"=>"幗",
 "幂"=>"冪",
-"幺"=>"么",
 "庄"=>"莊",
 "庆"=>"慶",
 "庐"=>"廬",
@@ -835,7 +829,6 @@ $zh2TW=array(
 "殡"=>"殯",
 "㱮"=>"殨",
 "㱩"=>"殰",
-"殰"=>"㱩",
 "殴"=>"毆",
 "毁"=>"毀",
 "毂"=>"轂",
@@ -939,7 +932,6 @@ $zh2TW=array(
 "濑"=>"瀨",
 "濒"=>"瀕",
 "㲿"=>"瀇",
-"瀇"=>"㲿",
 "灏"=>"灝",
 "灭"=>"滅",
 "灯"=>"燈",
@@ -971,10 +963,8 @@ $zh2TW=array(
 "焖"=>"燜",
 "焘"=>"燾",
 "㶽"=>"煱",
-"煱"=>"㶽",
 "煴"=>"熅",
 "㶶"=>"燶",
-"燶"=>"㶶",
 "爱"=>"愛",
 "爷"=>"爺",
 "牍"=>"牘",
@@ -1006,7 +996,6 @@ $zh2TW=array(
 "献"=>"獻",
 "獭"=>"獺",
 "㺍"=>"獱",
-"獱"=>"㺍",
 "玑"=>"璣",
 "玚"=>"瑒",
 "玛"=>"瑪",
@@ -1122,7 +1111,6 @@ $zh2TW=array(
 "稆"=>"穭",
 "税"=>"稅",
 "䅉"=>"稏",
-"稏"=>"䅉",
 "稣"=>"穌",
 "稳"=>"穩",
 "穑"=>"穡",
@@ -1180,13 +1168,10 @@ $zh2TW=array(
 "䌹"=>"絅",
 "絷"=>"縶",
 "䌼"=>"綐",
-"綐"=>"䌼",
 "䌽"=>"綵",
-"綵"=>"䌽",
 "䌸"=>"縳",
 "䍁"=>"繸",
 "䍀"=>"繿",
-"繿"=>"䍀",
 "纟"=>"糹",
 "纠"=>"糾",
 "纡"=>"紆",
@@ -1462,7 +1447,6 @@ $zh2TW=array(
 "蕲"=>"蘄",
 "薮"=>"藪",
 "䓕"=>"薳",
-"薳"=>"䓕",
 "藓"=>"蘚",
 "蘖"=>"櫱",
 "虏"=>"虜",
@@ -1497,7 +1481,6 @@ $zh2TW=array(
 "螀"=>"螿",
 "螨"=>"蟎",
 "䗖"=>"螮",
-"螮"=>"䗖",
 "蟏"=>"蠨",
 "衅"=>"釁",
 "衔"=>"銜",
@@ -1520,7 +1503,6 @@ $zh2TW=array(
 "褛"=>"褸",
 "褴"=>"襤",
 "䙓"=>"襬",
-"襬"=>"䙓",
 "见"=>"見",
 "观"=>"觀",
 "觃"=>"覎",
@@ -1546,7 +1528,6 @@ $zh2TW=array(
 "誉"=>"譽",
 "誊"=>"謄",
 "䜧"=>"譅",
-"譅"=>"䜧",
 "讠"=>"訁",
 "计"=>"計",
 "订"=>"訂",
@@ -1696,9 +1677,7 @@ $zh2TW=array(
 "谶"=>"讖",
 "豮"=>"豶",
 "䝙"=>"貙",
-"貙"=>"䝙",
 "䞐"=>"賰",
-"賰"=>"䞐",
 "贝"=>"貝",
 "贞"=>"貞",
 "负"=>"負",
@@ -1898,6 +1877,7 @@ $zh2TW=array(
 "鉴"=>"鑒",
 "銮"=>"鑾",
 "錾"=>"鏨",
+"𨱏"=>"鎝",
 "钅"=>"釒",
 "钆"=>"釓",
 "钇"=>"釔",
@@ -2213,7 +2193,6 @@ $zh2TW=array(
 "静"=>"靜",
 "靥"=>"靨",
 "䩄"=>"靦",
-"靦"=>"䩄",
 "鞑"=>"韃",
 "鞒"=>"鞽",
 "鞯"=>"韉",
@@ -2339,7 +2318,6 @@ $zh2TW=array(
 "馔"=>"饌",
 "馕"=>"饢",
 "䯄"=>"騧",
-"騧"=>"䯄",
 "马"=>"馬",
 "驭"=>"馭",
 "驮"=>"馱",
@@ -2514,7 +2492,6 @@ $zh2TW=array(
 "䴘"=>"鷈",
 "䴙"=>"鷿",
 "㶉"=>"鸂",
-"鸂"=>"㶉",
 "鸟"=>"鳥",
 "鸠"=>"鳩",
 "鸢"=>"鳶",
@@ -2672,6 +2649,12 @@ $zh2TW=array(
 "丰采" => 	"丰采",
 "丰韵" => 	"丰韻",
 "主干" => 	"主幹",
+"么么唱唱" => 	"么么唱唱",
+"么儿" => 	"么兒",
+"么喝" => 	"么喝",
+"么妹" => 	"么妹",
+"么弟" => 	"么弟",
+"么爷" => 	"么爺",
 "九世之雠" => 	"九世之讎",
 "九只" => 	"九隻",
 "干丝" => 	"乾絲",
@@ -4562,300 +4545,9 @@ $zh2TW=array(
 "冬冬" => 	"鼕鼕",
 "龙卷" => 	"龍卷",
 "龙须" => 	"龍鬚",
-"缺省"=>"預設",
-"串行"=>"串列",
-"以太网"=>"乙太網",
-"位图"=>"點陣圖",
-"例程"=>"常式",
-"信道"=>"通道",
-"光标"=>"游標",
-"光盘"=>"光碟",
-"光驱"=>"光碟機",
-"全角"=>"全形",
-"加载"=>"載入",
-"半角"=>"半形",
-"变量"=>"變數",
-"噪声"=>"雜訊",
-"脱机"=>"離線",
-"声卡"=>"音效卡",
-"老字号"=>"老字號",
-"字号"=>"字型大小",
-"字库"=>"字型檔",
-"字段"=>"欄位",
-"字符"=>"字元",
-"存盘"=>"存檔",
-"寻址"=>"定址",
-"尾注"=>"章節附註",
-"异步"=>"非同步",
-"总线"=>"匯流排",
-"括号"=>"括弧",
-"接口"=>"介面",
-"控件"=>"控制項",
-"权限"=>"許可權",
-"盘片"=>"碟片",
-"硅片"=>"矽片",
-"硅谷"=>"矽谷",
-"硬盘"=>"硬碟",
-"磁盘"=>"磁碟",
-"磁道"=>"磁軌",
-"程控"=>"程式控制",
-"端口"=>"埠",
-"算子"=>"運算元",
-"算法"=>"演算法",
-"芯片"=>"晶片",
-"芯片"=>"晶元",
-"词组"=>"片語",
-"译码"=>"解碼",
-"软驱"=>"軟碟機",
-"快闪存储器"=>"快閃記憶體",
-"闪存"=>"快閃記憶體",
-"鼠标"=>"滑鼠",
-"进制"=>"進位",
-"交互式"=>"互動式",
-"仿真"=>"模擬",
-"优先级"=>"優先順序",
-"传感"=>"感測",
-"便携式"=>"攜帶型",
-"信息论"=>"資訊理論",
-"写保护"=>"防寫",
-"分布式"=>"分散式",
-"分辨率"=>"解析度",
-"服务器"=>"伺服器",
-"等于"=>"等於",
-"局域网"=>"區域網",
-"计算机"=>"電腦",
-"扫瞄仪"=>"掃瞄器",
-"宽带"=>"寬頻",
-"数据库"=>"資料庫",
-"奶酪"=>"乳酪",
-"巨商"=>"鉅賈",
-"手电"=>"手電筒",
-"万历"=>"萬曆",
-"永历"=>"永曆",
-"词汇"=>"辭彙",
-"习用"=>"慣用",
-"元音"=>"母音",
-"任意球"=>"自由球",
-"头球"=>"頭槌",
-"入球"=>"進球",
-"粒入球"=>"顆進球",
-"打门"=>"射門",
-"火锅盖帽"=>"蓋火鍋",
-"打印机"=>"印表機",
-"打印機"=>"印表機",
-"字节"=>"位元組",
-"字節"=>"位元組",
-"打印"=>"列印",
-"打印"=>"列印",
-"硬件"=>"硬體",
-"硬件"=>"硬體",
-"二极管"=>"二極體",
-"二極管"=>"二極體",
-"三极管"=>"三極體",
-"三極管"=>"三極體",
-"软件"=>"軟體",
-"軟件"=>"軟體",
-"网络"=>"網路",
-"網絡"=>"網路",
-"人工智能"=>"人工智慧",
-"航天飞机"=>"太空梭",
-"穿梭機"=>"太空梭",
-"因特网"=>"網際網路",
-"互聯網"=>"網際網路",
-"机器人"=>"機器人",
-"機械人"=>"機器人",
-"移动电话"=>"行動電話",
-"流動電話"=>"行動電話",
-"调制解调器"=>"數據機",
-"調制解調器"=>"數據機",
-"短信"=>"簡訊",
-"短訊"=>"簡訊",
-"乌兹别克斯坦"=>"烏茲別克",
-"乍得"=>"查德",
-"乍得"=>"查德",
-"也门"=>"葉門",
-"也門"=>"葉門",
-"伯利兹"=>"貝里斯",
-"伯利茲"=>"貝里斯",
-"佛得角"=>"維德角",
-"佛得角"=>"維德角",
-"克罗地亚"=>"克羅埃西亞",
-"克羅地亞"=>"克羅埃西亞",
-"冈比亚"=>"甘比亞",
-"岡比亞"=>"甘比亞",
-"几内亚比绍"=>"幾內亞比索",
-"幾內亞比紹"=>"幾內亞比索",
-"列支敦士登"=>"列支敦斯登",
-"列支敦士登"=>"列支敦斯登",
-"利比里亚"=>"賴比瑞亞",
-"利比里亞"=>"賴比瑞亞",
-"加纳"=>"迦納",
-"加納"=>"迦納",
-"加蓬"=>"加彭",
-"加蓬"=>"加彭",
-"博茨瓦纳"=>"波札那",
-"博茨瓦納"=>"波札那",
-"卡塔尔"=>"卡達",
-"卡塔爾"=>"卡達",
-"卢旺达"=>"盧安達",
-"盧旺達"=>"盧安達",
-"危地马拉"=>"瓜地馬拉",
-"危地馬拉"=>"瓜地馬拉",
-"厄瓜多尔"=>"厄瓜多",
-"厄瓜多爾"=>"厄瓜多",
-"厄立特里亚"=>"厄利垂亞",
-"厄立特里亞"=>"厄利垂亞",
-"吉布提"=>"吉布地",
-"吉布堤"=>"吉布地",
-"哈萨克斯坦"=>"哈薩克",
-"哥斯达黎加"=>"哥斯大黎加",
-"哥斯達黎加"=>"哥斯大黎加",
-"图瓦卢"=>"吐瓦魯",
-"圖瓦盧"=>"吐瓦魯",
-"土库曼斯坦"=>"土庫曼",
-"圣卢西亚"=>"聖露西亞",
-"聖盧西亞"=>"聖露西亞",
-"圣基茨和尼维斯"=>"聖克里斯多福及尼維斯",
-"聖吉斯納域斯"=>"聖克里斯多福及尼維斯",
-"圣文森特和格林纳丁斯"=>"聖文森及格瑞那丁",
-"聖文森特和格林納丁斯"=>"聖文森及格瑞那丁",
-"圣马力诺"=>"聖馬利諾",
-"聖馬力諾"=>"聖馬利諾",
-"圭亚那"=>"蓋亞那",
-"圭亞那"=>"蓋亞那",
-"坦桑尼亚"=>"坦尚尼亞",
-"坦桑尼亞"=>"坦尚尼亞",
-"埃塞俄比亚"=>"衣索匹亞",
-"埃塞俄比亞"=>"衣索匹亞",
-"基里巴斯"=>"吉里巴斯",
-"基里巴斯"=>"吉里巴斯",
-"塔吉克斯坦"=>"塔吉克",
-"塞拉利昂"=>"獅子山",
-"塞拉利昂"=>"獅子山",
-"塞浦路斯"=>"塞普勒斯",
-"塞浦路斯"=>"塞普勒斯",
-"塞舌尔"=>"塞席爾",
-"塞舌爾"=>"塞席爾",
-"多米尼加"=>"多明尼加",
-"多明尼加共和國"=>"多明尼加",
-"多米尼加联邦"=>"多米尼克",
-"多明尼加聯邦"=>"多米尼克",
-"安提瓜和巴布达"=>"安地卡及巴布達",
-"安提瓜和巴布達"=>"安地卡及巴布達",
-"尼日利亚"=>"奈及利亞",
-"尼日利亞"=>"奈及利亞",
-"尼日尔"=>"尼日",
-"尼日爾"=>"尼日",
-"巴巴多斯"=>"巴貝多",
-"巴巴多斯"=>"巴貝多",
-"巴布亚新几内亚"=>"巴布亞紐幾內亞",
-"巴布亞新畿內亞"=>"巴布亞紐幾內亞",
-"布基纳法索"=>"布吉納法索",
-"布基納法索"=>"布吉納法索",
-"布隆迪"=>"蒲隆地",
-"布隆迪"=>"蒲隆地",
-"希腊"=>"希臘",
-"帕劳"=>"帛琉",
-"意大利"=>"義大利",
-"意大利"=>"義大利",
-"所罗门群岛"=>"索羅門群島",
-"所羅門群島"=>"索羅門群島",
-"文莱"=>"汶萊",
-"斯威士兰"=>"史瓦濟蘭",
-"斯威士蘭"=>"史瓦濟蘭",
-"斯洛文尼亚"=>"斯洛維尼亞",
-"斯洛文尼亞"=>"斯洛維尼亞",
-"新西兰"=>"紐西蘭",
-"新西蘭"=>"紐西蘭",
-"格林纳达"=>"格瑞那達",
-"格林納達"=>"格瑞那達",
-"格鲁吉亚"=>"喬治亞",
-"格魯吉亞"=>"喬治亞",
-"佐治亚"=>"喬治亞",
-"佐治亞"=>"喬治亞",
-"毛里塔尼亚"=>"茅利塔尼亞",
-"毛里塔尼亞"=>"茅利塔尼亞",
-"毛里求斯"=>"模里西斯",
-"毛里裘斯"=>"模里西斯",
-"沙特阿拉伯"=>"沙烏地阿拉伯",
-"沙地阿拉伯"=>"沙烏地阿拉伯",
-"波斯尼亚和黑塞哥维那"=>"波士尼亞赫塞哥維納",
-"波斯尼亞黑塞哥維那"=>"波士尼亞赫塞哥維納",
-"津巴布韦"=>"辛巴威",
-"津巴布韋"=>"辛巴威",
-"洪都拉斯"=>"宏都拉斯",
-"洪都拉斯"=>"宏都拉斯",
-"特立尼达和托巴哥"=>"千里達托貝哥",
-"特立尼達和多巴哥"=>"千里達托貝哥",
-"瑙鲁"=>"諾魯",
-"瑙魯"=>"諾魯",
-"瓦努阿图"=>"萬那杜",
-"瓦努阿圖"=>"萬那杜",
-"溫納圖萬"=>"那杜",
-"科摩罗"=>"葛摩",
-"科摩羅"=>"葛摩",
-"科特迪瓦"=>"象牙海岸",
-"突尼斯"=>"突尼西亞",
-"索马里"=>"索馬利亞",
-"索馬里"=>"索馬利亞",
-"老挝"=>"寮國",
-"老撾"=>"寮國",
-"肯尼亚"=>"肯亞",
-"肯雅"=>"肯亞",
-"苏里南"=>"蘇利南",
-"莫桑比克"=>"莫三比克",
-"莱索托"=>"賴索托",
-"萊索托"=>"賴索托",
-"贝宁"=>"貝南",
-"貝寧"=>"貝南",
-"赞比亚"=>"尚比亞",
-"贊比亞"=>"尚比亞",
-"阿塞拜疆"=>"亞塞拜然",
-"阿塞拜疆"=>"亞塞拜然",
-"阿拉伯联合酋长国"=>"阿拉伯聯合大公國",
-"阿拉伯聯合酋長國"=>"阿拉伯聯合大公國",
-"马尔代夫"=>"馬爾地夫",
-"馬爾代夫"=>"馬爾地夫",
-"马耳他"=>"馬爾他",
-"马里共和国"=>"馬利共和國",
-"馬里共和國"=>"馬利共和國",
-"方便面"=>"速食麵",
-"快速面"=>"速食麵",
-"即食麵"=>"速食麵",
-"薯仔"=>"土豆",
-"蹦极跳"=>"笨豬跳",
-"绑紧跳"=>"笨豬跳",
-"冷菜"=>"冷盤",
-"凉菜"=>"冷盤",
-"出租车"=>"計程車",
-"台球"=>"撞球",
-"桌球"=>"撞球",
-"雪糕"=>"冰淇淋",
-"卫生"=>"衛生",
-"衞生"=>"衛生",
-"平治"=>"賓士",
-"奔驰"=>"賓士",
-"積架"=>"捷豹",
-"福士"=>"福斯",
-"雪铁龙"=>"雪鐵龍",
-"马自达"=>"馬自達",
-"萬事得"=>"馬自達",
-"拿破仑"=>"拿破崙",
-"拿破侖"=>"拿破崙",
-"布什"=>"布希",
-"布殊"=>"布希",
-"克林顿"=>"柯林頓",
-"克林頓"=>"柯林頓",
-"侯赛因"=>"海珊",
-"侯賽因"=>"海珊",
-"凡高"=>"梵谷",
-"狄安娜"=>"黛安娜",
-"戴安娜"=>"黛安娜",
-"赫拉"=>"希拉",
 );
 
-$zh2CN=array(
-"么"=>"么",
+$zh2Hans = array(
 "瀋"=>"沈",
 "畫"=>"划",
 "鍾"=>"钟",
@@ -4863,8 +4555,7 @@ $zh2CN=array(
 "餘"=>"余",
 "鯰"=>"鲇",
 "é¹¼"=>"ç¡·",
-"㟆"=>"㠏",
-"㛟"=>"𡞵",
+"㠏"=>"㟆",
 "𡞵"=>"㛟",
 "万"=>"万",
 "与"=>"与",
@@ -4940,7 +4631,6 @@ $zh2CN=array(
 "優"=>"优",
 "儲"=>"储",
 "儷"=>"俪",
-"㑩"=>"儸",
 "儸"=>"㑩",
 "儺"=>"傩",
 "儻"=>"傥",
@@ -4980,10 +4670,8 @@ $zh2CN=array(
 "劊"=>"刽",
 "劌"=>"刿",
 "劍"=>"剑",
-"㓥"=>"劏",
 "劏"=>"㓥",
 "劑"=>"剂",
-"㔉"=>"劚",
 "劚"=>"㔉",
 "勁"=>"劲",
 "動"=>"动",
@@ -5059,7 +4747,6 @@ $zh2CN=array(
 "嘽"=>"啴",
 "噁"=>"恶",
 "噓"=>"嘘",
-"㖊"=>"噚",
 "噚"=>"㖊",
 "噝"=>"咝",
 "噠"=>"哒",
@@ -5561,7 +5248,6 @@ $zh2CN=array(
 "殫"=>"殚",
 "殮"=>"殓",
 "殯"=>"殡",
-"㱩"=>"殰",
 "殰"=>"㱩",
 "殲"=>"歼",
 "殺"=>"杀",
@@ -5666,7 +5352,6 @@ $zh2CN=array(
 "濾"=>"滤",
 "瀅"=>"滢",
 "瀆"=>"渎",
-"㲿"=>"瀇",
 "瀇"=>"㲿",
 "瀉"=>"泻",
 "瀋"=>"沈",
@@ -5704,7 +5389,6 @@ $zh2CN=array(
 "煥"=>"焕",
 "煩"=>"烦",
 "煬"=>"炀",
-"㶽"=>"煱",
 "煱"=>"㶽",
 "熅"=>"煴",
 "熒"=>"荧",
@@ -5722,7 +5406,6 @@ $zh2CN=array(
 "燦"=>"灿",
 "燭"=>"烛",
 "燴"=>"烩",
-"㶶"=>"燶",
 "燶"=>"㶶",
 "燼"=>"烬",
 "燾"=>"焘",
@@ -5755,7 +5438,6 @@ $zh2CN=array(
 "獫"=>"猃",
 "獮"=>"狝",
 "獰"=>"狞",
-"㺍"=>"獱",
 "獱"=>"㺍",
 "獲"=>"获",
 "獵"=>"猎",
@@ -5893,7 +5575,6 @@ $zh2CN=array(
 "种"=>"种",
 "稅"=>"税",
 "稈"=>"秆",
-"䅉"=>"稏",
 "稏"=>"䅉",
 "稟"=>"禀",
 "種"=>"种",
@@ -6029,7 +5710,6 @@ $zh2CN=array(
 "綉"=>"绣",
 "綌"=>"绤",
 "綏"=>"绥",
-"䌼"=>"綐",
 "綐"=>"䌼",
 "經"=>"经",
 "綜"=>"综",
@@ -6046,7 +5726,6 @@ $zh2CN=array(
 "網"=>"网",
 "綳"=>"绷",
 "綴"=>"缀",
-"䌽"=>"綵",
 "綵"=>"䌽",
 "綸"=>"纶",
 "綹"=>"绺",
@@ -6133,7 +5812,6 @@ $zh2CN=array(
 "繼"=>"继",
 "繽"=>"缤",
 "ç¹¾"=>"ç¼±",
-"䍀"=>"繿",
 "繿"=>"䍀",
 "纈"=>"缬",
 "纊"=>"纩",
@@ -6217,7 +5895,6 @@ $zh2CN=array(
 "艱"=>"艰",
 "艷"=>"艳",
 "芻"=>"刍",
-"苎"=>"苧",
 "苧"=>"苎",
 "苹"=>"苹",
 "范"=>"范",
@@ -6276,7 +5953,6 @@ $zh2CN=array(
 "薟"=>"莶",
 "薦"=>"荐",
 "薩"=>"萨",
-"䓕"=>"薳",
 "薳"=>"䓕",
 "薴"=>"苧",
 "薺"=>"荠",
@@ -6320,7 +5996,6 @@ $zh2CN=array(
 "螄"=>"蛳",
 "螞"=>"蚂",
 "螢"=>"萤",
-"䗖"=>"螮",
 "螮"=>"䗖",
 "螻"=>"蝼",
 "螿"=>"螀",
@@ -6372,7 +6047,6 @@ $zh2CN=array(
 "襠"=>"裆",
 "襤"=>"褴",
 "襪"=>"袜",
-"䙓"=>"襬",
 "襬"=>"䙓",
 "襯"=>"衬",
 "襲"=>"袭",
@@ -6537,7 +6211,6 @@ $zh2CN=array(
 "謳"=>"讴",
 "謹"=>"谨",
 "謾"=>"谩",
-"䜧"=>"譅",
 "譅"=>"䜧",
 "證"=>"证",
 "譎"=>"谲",
@@ -6571,7 +6244,6 @@ $zh2CN=array(
 "豬"=>"猪",
 "豶"=>"豮",
 "貓"=>"猫",
-"䝙"=>"貙",
 "貙"=>"䝙",
 "貝"=>"贝",
 "貞"=>"贞",
@@ -6626,7 +6298,6 @@ $zh2CN=array(
 "賫"=>"赍",
 "賬"=>"账",
 "賭"=>"赌",
-"䞐"=>"賰",
 "賰"=>"䞐",
 "賴"=>"赖",
 "賵"=>"赗",
@@ -6975,6 +6646,7 @@ $zh2CN=array(
 "鎘"=>"镉",
 "鎚"=>"锤",
 "鎛"=>"镈",
+"鎝"=>"𨱏",
 "鎡"=>"镃",
 "鎢"=>"钨",
 "鎣"=>"蓥",
@@ -7145,7 +6817,6 @@ $zh2CN=array(
 "靈"=>"灵",
 "靚"=>"靓",
 "靜"=>"静",
-"䩄"=>"靦",
 "靨"=>"靥",
 "鞀"=>"鼗",
 "鞏"=>"巩",
@@ -7325,7 +6996,6 @@ $zh2CN=array(
 "騖"=>"骛",
 "騙"=>"骗",
 "騤"=>"骙",
-"䯄"=>"騧",
 "騧"=>"䯄",
 "騫"=>"骞",
 "騭"=>"骘",
@@ -7567,7 +7237,6 @@ $zh2CN=array(
 "é·º"=>"é¹­",
 "鷽"=>"鸴",
 "鷿"=>"䴙",
-"㶉"=>"鸂",
 "鸂"=>"㶉",
 "鸇"=>"鹯",
 "鸌"=>"鹱",
@@ -7638,15 +7307,11 @@ $zh2CN=array(
 "名畫" => 	"名画",
 "奇畫" => 	"奇画",
 "如畫" => 	"如画",
-"么 " => 	"幺 ",
-"么廝" => 	"幺厮",
-"么爹" => 	"幺爹",
 "弱鹼" => 	"弱碱",
 "彩畫" => 	"彩画",
 "所畫" => 	"所画",
 "扉畫" => 	"扉画",
 "教畫" => 	"教画",
-"楊么" => 	"杨幺",
 "水鹼" => 	"水碱",
 "洋鹼" => 	"洋碱",
 "炭畫" => 	"炭画",
@@ -7698,7 +7363,6 @@ $zh2CN=array(
 "策畫" => 	"策画",
 "組畫" => 	"组画",
 "絹畫" => 	"绢画",
-"老么" => 	"老幺",
 "耐鹼" => 	"耐碱",
 "肉鹼" => 	"肉碱",
 "膠畫" => 	"胶画",
@@ -7785,317 +7449,302 @@ $zh2CN=array(
 "鍾  " => 	"锺  ",
 "靜物畫" => 	"静物画",
 "餘  " => 	"馀  ",
-"記憶體"=>"内存",
-"預設"=>"默认",
-"串列"=>"串行",
-"乙太網"=>"以太网",
-"點陣圖"=>"位图",
-"常式"=>"例程",
-"游標"=>"光标",
-"光碟"=>"光盘",
-"光碟機"=>"光驱",
-"全形"=>"全角",
-"共用"=>"共享",
-"載入"=>"加载",
-"半形"=>"半角",
-"變數"=>"变量",
-"雜訊"=>"噪声",
-"因數"=>"因子",
-"功能變數名稱"=>"域名",
-"音效卡"=>"声卡",
-"字型大小"=>"字号",
-"字型檔"=>"字库",
-"欄位"=>"字段",
-"字元"=>"字符",
-"存檔"=>"存盘",
-"定址"=>"寻址",
-"章節附註"=>"尾注",
-"非同步"=>"异步",
-"匯流排"=>"总线",
-"括弧"=>"括号",
-"介面"=>"接口",
-"控制項"=>"控件",
-"許可權"=>"权限",
-"碟片"=>"盘片",
-"矽片"=>"硅片",
-"矽谷"=>"硅谷",
-"硬碟"=>"硬盘",
-"磁碟"=>"磁盘",
-"磁軌"=>"磁道",
-"程式控制"=>"程控",
-"運算元"=>"算子",
-"演算法"=>"算法",
-"晶片"=>"芯片",
-"晶元"=>"芯片",
-"片語"=>"词组",
-"軟碟機"=>"软驱",
-"快閃記憶體"=>"快闪存储器",
-"滑鼠"=>"鼠标",
-"進位"=>"进制",
-"互動式"=>"交互式",
-"優先順序"=>"优先级",
-"感測"=>"传感",
-"攜帶型"=>"便携式",
-"資訊理論"=>"信息论",
-"迴圈"=>"循环",
-"防寫"=>"写保护",
-"分散式"=>"分布式",
-"解析度"=>"分辨率",
-"伺服器"=>"服务器",
-"等於"=>"等于",
-"區域網"=>"局域网",
-"巨集"=>"宏",
-"掃瞄器"=>"扫瞄仪",
-"寬頻"=>"宽带",
-"資料庫"=>"数据库",
-"乳酪"=>"奶酪",
-"鉅賈"=>"巨商",
-"手電筒"=>"手电",
-"萬曆"=>"万历",
-"永曆"=>"永历",
-"辭彙"=>"词汇",
-"母音"=>"元音",
-"自由球"=>"任意球",
-"頭槌"=>"头球",
-"進球"=>"入球",
-"顆進球"=>"粒入球",
-"射門"=>"打门",
-"蓋火鍋"=>"火锅盖帽",
-"印表機"=>"打印机",
-"打印機"=>"打印机",
-"位元組"=>"字节",
-"字節"=>"字节",
-"列印"=>"打印",
-"打印"=>"打印",
-"硬體"=>"硬件",
-"二極體"=>"二极管",
-"二極管"=>"二极管",
-"三極體"=>"三极管",
-"三極管"=>"三极管",
-"數位"=>"数码",
-"數碼"=>"数码",
-"軟體"=>"软件",
-"軟件"=>"软件",
-"網路"=>"网络",
-"網絡"=>"网络",
-"人工智慧"=>"人工智能",
-"太空梭"=>"航天飞机",
-"穿梭機"=>"航天飞机",
-"網際網路"=>"因特网",
-"互聯網"=>"因特网",
-"機械人"=>"机器人",
-"機器人"=>"机器人",
-"行動電話"=>"移动电话",
-"流動電話"=>"移动电话",
-"調制解調器"=>"调制解调器",
-"數據機"=>"调制解调器",
-"短訊"=>"短信",
-"簡訊"=>"短信",
-"烏茲別克"=>"乌兹别克斯坦",
-"查德"=>"乍得",
-"乍得"=>"乍得",
-"也門"=>"",
-"葉門"=>"也门",
-"伯利茲"=>"伯利兹",
-"貝里斯"=>"伯利兹",
-"維德角"=>"佛得角",
-"佛得角"=>"佛得角",
-"克羅地亞"=>"克罗地亚",
-"克羅埃西亞"=>"克罗地亚",
-"岡比亞"=>"冈比亚",
-"甘比亞"=>"冈比亚",
-"幾內亞比紹"=>"几内亚比绍",
-"幾內亞比索"=>"几内亚比绍",
-"列支敦斯登"=>"列支敦士登",
-"列支敦士登"=>"列支敦士登",
-"利比里亞"=>"利比里亚",
-"賴比瑞亞"=>"利比里亚",
-"加納"=>"加纳",
-"迦納"=>"加纳",
-"加彭"=>"加蓬",
-"加蓬"=>"加蓬",
-"博茨瓦納"=>"博茨瓦纳",
-"波札那"=>"博茨瓦纳",
-"卡塔爾"=>"卡塔尔",
-"卡達"=>"卡塔尔",
-"盧旺達"=>"卢旺达",
-"盧安達"=>"卢旺达",
-"危地馬拉"=>"危地马拉",
-"瓜地馬拉"=>"危地马拉",
-"厄瓜多爾"=>"厄瓜多尔",
-"厄瓜多"=>"厄瓜多尔",
-"厄立特里亞"=>"厄立特里亚",
-"厄利垂亞"=>"厄立特里亚",
-"吉布堤"=>"吉布提",
-"吉布地"=>"吉布提",
-"哈薩克"=>"哈萨克斯坦",
-"哥斯達黎加"=>"哥斯达黎加",
-"哥斯大黎加"=>"哥斯达黎加",
-"圖瓦盧"=>"图瓦卢",
-"吐瓦魯"=>"图瓦卢",
-"土庫曼"=>"土库曼斯坦",
-"聖盧西亞"=>"圣卢西亚",
-"聖露西亞"=>"圣卢西亚",
-"聖吉斯納域斯"=>"圣基茨和尼维斯",
-"聖克里斯多福及尼維斯"=>"圣基茨和尼维斯",
-"聖文森特和格林納丁斯"=>"圣文森特和格林纳丁斯",
-"聖文森及格瑞那丁"=>"圣文森特和格林纳丁斯",
-"聖馬力諾"=>"圣马力诺",
-"聖馬利諾"=>"圣马力诺",
-"圭亞那"=>"圭亚那",
-"蓋亞那"=>"圭亚那",
-"坦桑尼亞"=>"坦桑尼亚",
-"坦尚尼亞"=>"坦桑尼亚",
-"埃塞俄比亞"=>"埃塞俄比亚",
-"衣索匹亞"=>"埃塞俄比亚",
-"衣索比亞"=>"埃塞俄比亚",
-"吉里巴斯"=>"基里巴斯",
-"基里巴斯"=>"基里巴斯",
-"塔吉克"=>"塔吉克斯坦",
-"塞拉利昂"=>"塞拉利昂",
-"塞普勒斯"=>"塞浦路斯",
-"塞浦路斯"=>"塞浦路斯",
-"塞舌爾"=>"塞舌尔",
-"塞席爾"=>"塞舌尔",
-"多明尼加共和國"=>"多米尼加",
-"多明尼加"=>"多米尼加",
-"多明尼加聯邦"=>"多米尼加联邦",
-"多米尼克"=>"多米尼加联邦",
-"安提瓜和巴布達"=>"安提瓜和巴布达",
-"安地卡及巴布達"=>"安提瓜和巴布达",
-"尼日利亞"=>"尼日利亚",
-"奈及利亞"=>"尼日利亚",
-"尼日爾"=>"尼日尔",
-"尼日"=>"尼日尔",
-"巴貝多"=>"巴巴多斯",
-"巴巴多斯"=>"巴巴多斯",
-"巴布亞新畿內亞"=>"巴布亚新几内亚",
-"巴布亞紐幾內亞"=>"巴布亚新几内亚",
-"布基納法索"=>"布基纳法索",
-"布吉納法索"=>"布基纳法索",
-"蒲隆地"=>"布隆迪",
-"布隆迪"=>"布隆迪",
-"希臘"=>"希腊",
-"帛琉"=>"帕劳",
-"義大利"=>"意大利",
-"意大利"=>"意大利",
-"所羅門群島"=>"所罗门群岛",
-"索羅門群島"=>"所罗门群岛",
-"汶萊"=>"文莱",
-"斯威士蘭"=>"斯威士兰",
-"史瓦濟蘭"=>"斯威士兰",
-"斯洛文尼亞"=>"斯洛文尼亚",
-"斯洛維尼亞"=>"斯洛文尼亚",
-"新西蘭"=>"新西兰",
-"紐西蘭"=>"新西兰",
-"格林納達"=>"格林纳达",
-"格瑞那達"=>"格林纳达",
-"格魯吉亞"=>"乔治亚",
-"喬治亞"=>"乔治亚",
-"梵蒂岡"=>"梵蒂冈",
-"毛里塔尼亞"=>"毛里塔尼亚",
-"茅利塔尼亞"=>"毛里塔尼亚",
-"毛里裘斯"=>"毛里求斯",
-"模里西斯"=>"毛里求斯",
-"沙地阿拉伯"=>"沙特阿拉伯",
-"沙烏地阿拉伯"=>"沙特阿拉伯",
-"波斯尼亞黑塞哥維那"=>"波斯尼亚和黑塞哥维那",
-"波士尼亞赫塞哥維納"=>"波斯尼亚和黑塞哥维那",
-"津巴布韋"=>"津巴布韦",
-"辛巴威"=>"津巴布韦",
-"宏都拉斯"=>"洪都拉斯",
-"洪都拉斯"=>"洪都拉斯",
-"特立尼達和多巴哥"=>"特立尼达和托巴哥",
-"千里達托貝哥"=>"特立尼达和托巴哥",
-"瑙魯"=>"瑙鲁",
-"諾魯"=>"瑙鲁",
-"瓦努阿圖"=>"瓦努阿图",
-"萬那杜"=>"瓦努阿图",
-"溫納圖"=>"瓦努阿图",
-"科摩羅"=>"科摩罗",
-"葛摩"=>"科摩罗",
-"象牙海岸"=>"科特迪瓦",
-"突尼西亞"=>"突尼斯",
-"索馬里"=>"索马里",
-"索馬利亞"=>"索马里",
-"老撾"=>"老挝",
-"寮國"=>"老挝",
-"肯雅"=>"肯尼亚",
-"肯亞"=>"肯尼亚",
-"蘇利南"=>"苏里南",
-"莫三比克"=>"莫桑比克",
-"莫桑比克"=>"莫桑比克",
-"萊索托"=>"莱索托",
-"賴索托"=>"莱索托",
-"貝寧"=>"贝宁",
-"貝南"=>"贝宁",
-"贊比亞"=>"赞比亚",
-"尚比亞"=>"赞比亚",
-"亞塞拜然"=>"阿塞拜疆",
-"阿塞拜疆"=>"阿塞拜疆",
-"阿拉伯聯合酋長國"=>"阿拉伯联合酋长国",
-"阿拉伯聯合大公國"=>"阿拉伯联合酋长国",
-"南韓"=>"韩国",
-"馬爾代夫"=>"马尔代夫",
-"馬爾地夫"=>"马尔代夫",
-"馬爾他"=>"马耳他",
-"馬利共和國"=>"马里共和国",
-"即食麵"=>"方便面",
-"快速面"=>"方便面",
-"速食麵"=>"方便面",
-"泡麵"=>"方便面",
-"笨豬跳"=>"蹦极跳",
-"绑紧跳"=>"蹦极跳",
-"冷盤　　"=>"凉菜",
-"冷菜"=>"凉菜",
-"散钱"=>"零钱",
-"谐星"=>"笑星　　　　",
-"夜学"=>"夜校",
-"华乐"=>"民乐",
-"中樂"=>"民乐",
-"屋价"=>"房价",
-"的士"=>"出租车",
-"計程車"=>"出租车",
-"公車"=>"公共汽车",
-"單車"=>"自行车",
-"節慶"=>"节日",
-"芝士"=>"乾酪",
-"狗隻"=>"犬只",
-"士多啤梨"=>"草莓",
-"忌廉"=>"奶油",
-"桌球"=>"台球",
-"撞球"=>"台球",
-"雪糕"=>"冰淇淋",
-"衞生"=>"卫生",
-"衛生"=>"卫生",
-"賓士"=>"奔驰",
-"平治"=>"奔驰",
-"積架"=>"捷豹",
-"福斯"=>"大众",
-"福士"=>"大众",
-"雪鐵龍"=>"雪铁龙",
-"萬事得"=>"马自达",
-"馬自達"=>"马自达",
-"寶獅"=>"标志",
-"拿破崙"=>"拿破仑",
-"布殊"=>"布什",
-"布希"=>"布什",
-"柯林頓"=>"克林顿",
-"克林頓"=>"克林顿",
-"薩達姆"=>"萨达姆",
-"海珊"=>"萨达姆",
-"梵谷"=>"凡高",
-"大衛碧咸"=>"大卫·贝克汉姆",
-"米高奧雲"=>"迈克尔·欧文",
-"卡佩雅蒂"=>"珍妮弗·卡普里亚蒂",
-"沙芬"=>"马拉特·萨芬",
-"舒麥加"=>"迈克尔·舒马赫",
-"希特拉"=>"希特勒",
-"黛安娜"=>"戴安娜",
-"希拉"=>"赫拉",
 );
 
-$zh2HK=array(
+$zh2TW = array(
+"缺省" => "預設",
+"串行" => "串列",
+"以太网" => "乙太網",
+"位图" => "點陣圖",
+"例程" => "常式",
+"信道" => "通道",
+"光标" => "游標",
+"光盘" => "光碟",
+"光驱" => "光碟機",
+"全角" => "全形",
+"加载" => "載入",
+"半角" => "半形",
+"变量" => "變數",
+"噪声" => "雜訊",
+"脱机" => "離線",
+"声卡" => "音效卡",
+"老字号" => "老字號",
+"字号" => "字型大小",
+"字库" => "字型檔",
+"字段" => "欄位",
+"字符" => "字元",
+"存盘" => "存檔",
+"寻址" => "定址",
+"尾注" => "章節附註",
+"异步" => "非同步",
+"总线" => "匯流排",
+"括号" => "括弧",
+"接口" => "介面",
+"控件" => "控制項",
+"权限" => "許可權",
+"盘片" => "碟片",
+"硅片" => "矽片",
+"硅谷" => "矽谷",
+"硬盘" => "硬碟",
+"磁盘" => "磁碟",
+"磁道" => "磁軌",
+"程控" => "程式控制",
+"端口" => "埠",
+"算子" => "運算元",
+"算法" => "演算法",
+"芯片" => "晶片",
+"芯片" => "晶元",
+"词组" => "片語",
+"译码" => "解碼",
+"软驱" => "軟碟機",
+"快闪存储器" => "快閃記憶體",
+"闪存" => "快閃記憶體",
+"鼠标" => "滑鼠",
+"进制" => "進位",
+"交互式" => "互動式",
+"仿真" => "模擬",
+"优先级" => "優先順序",
+"传感" => "感測",
+"便携式" => "攜帶型",
+"信息论" => "資訊理論",
+"写保护" => "防寫",
+"分布式" => "分散式",
+"分辨率" => "解析度",
+"服务器" => "伺服器",
+"等于" => "等於",
+"局域网" => "區域網",
+"计算机" => "電腦",
+"扫瞄仪" => "掃瞄器",
+"宽带" => "寬頻",
+"数据库" => "資料庫",
+"奶酪" => "乳酪",
+"巨商" => "鉅賈",
+"手电" => "手電筒",
+"万历" => "萬曆",
+"永历" => "永曆",
+"词汇" => "辭彙",
+"习用" => "慣用",
+"元音" => "母音",
+"任意球" => "自由球",
+"头球" => "頭槌",
+"入球" => "進球",
+"粒入球" => "顆進球",
+"打门" => "射門",
+"火锅盖帽" => "蓋火鍋",
+"打印机" => "印表機",
+"打印機" => "印表機",
+"字节" => "位元組",
+"字節" => "位元組",
+"打印" => "列印",
+"打印" => "列印",
+"硬件" => "硬體",
+"硬件" => "硬體",
+"二极管" => "二極體",
+"二極管" => "二極體",
+"三极管" => "三極體",
+"三極管" => "三極體",
+"软件" => "軟體",
+"軟件" => "軟體",
+"网络" => "網路",
+"網絡" => "網路",
+"人工智能" => "人工智慧",
+"航天飞机" => "太空梭",
+"穿梭機" => "太空梭",
+"因特网" => "網際網路",
+"互聯網" => "網際網路",
+"机器人" => "機器人",
+"機械人" => "機器人",
+"移动电话" => "行動電話",
+"流動電話" => "行動電話",
+"调制解调器" => "數據機",
+"調制解調器" => "數據機",
+"短信" => "簡訊",
+"短訊" => "簡訊",
+"乌兹别克斯坦" => "烏茲別克",
+"乍得" => "查德",
+"乍得" => "查德",
+"也门" => "葉門",
+"也門" => "葉門",
+"伯利兹" => "貝里斯",
+"伯利茲" => "貝里斯",
+"佛得角" => "維德角",
+"佛得角" => "維德角",
+"克罗地亚" => "克羅埃西亞",
+"克羅地亞" => "克羅埃西亞",
+"冈比亚" => "甘比亞",
+"岡比亞" => "甘比亞",
+"几内亚比绍" => "幾內亞比索",
+"幾內亞比紹" => "幾內亞比索",
+"列支敦士登" => "列支敦斯登",
+"列支敦士登" => "列支敦斯登",
+"利比里亚" => "賴比瑞亞",
+"利比里亞" => "賴比瑞亞",
+"加纳" => "迦納",
+"加納" => "迦納",
+"加蓬" => "加彭",
+"加蓬" => "加彭",
+"博茨瓦纳" => "波札那",
+"博茨瓦納" => "波札那",
+"卡塔尔" => "卡達",
+"卡塔爾" => "卡達",
+"卢旺达" => "盧安達",
+"盧旺達" => "盧安達",
+"危地马拉" => "瓜地馬拉",
+"危地馬拉" => "瓜地馬拉",
+"厄瓜多尔" => "厄瓜多",
+"厄瓜多爾" => "厄瓜多",
+"厄立特里亚" => "厄利垂亞",
+"厄立特里亞" => "厄利垂亞",
+"吉布提" => "吉布地",
+"吉布堤" => "吉布地",
+"哈萨克斯坦" => "哈薩克",
+"哥斯达黎加" => "哥斯大黎加",
+"哥斯達黎加" => "哥斯大黎加",
+"图瓦卢" => "吐瓦魯",
+"圖瓦盧" => "吐瓦魯",
+"土库曼斯坦" => "土庫曼",
+"圣卢西亚" => "聖露西亞",
+"聖盧西亞" => "聖露西亞",
+"圣基茨和尼维斯" => "聖克里斯多福及尼維斯",
+"聖吉斯納域斯" => "聖克里斯多福及尼維斯",
+"圣文森特和格林纳丁斯" => "聖文森及格瑞那丁",
+"聖文森特和格林納丁斯" => "聖文森及格瑞那丁",
+"圣马力诺" => "聖馬利諾",
+"聖馬力諾" => "聖馬利諾",
+"圭亚那" => "蓋亞那",
+"圭亞那" => "蓋亞那",
+"坦桑尼亚" => "坦尚尼亞",
+"坦桑尼亞" => "坦尚尼亞",
+"埃塞俄比亚" => "衣索比亞",
+"埃塞俄比亞" => "衣索比亞",
+"基里巴斯" => "吉里巴斯",
+"基里巴斯" => "吉里巴斯",
+"塔吉克斯坦" => "塔吉克",
+"塞拉利昂" => "獅子山",
+"塞拉利昂" => "獅子山",
+"塞浦路斯" => "塞普勒斯",
+"塞浦路斯" => "塞普勒斯",
+"塞舌尔" => "塞席爾",
+"塞舌爾" => "塞席爾",
+"多米尼加" => "多明尼加",
+"多明尼加共和國" => "多明尼加",
+"多米尼加联邦" => "多米尼克",
+"多明尼加聯邦" => "多米尼克",
+"安提瓜和巴布达" => "安地卡及巴布達",
+"安提瓜和巴布達" => "安地卡及巴布達",
+"尼日利亚" => "奈及利亞",
+"尼日利亞" => "奈及利亞",
+"尼日尔" => "尼日",
+"尼日爾" => "尼日",
+"巴巴多斯" => "巴貝多",
+"巴巴多斯" => "巴貝多",
+"巴布亚新几内亚" => "巴布亞紐幾內亞",
+"巴布亞新畿內亞" => "巴布亞紐幾內亞",
+"布基纳法索" => "布吉納法索",
+"布基納法索" => "布吉納法索",
+"布隆迪" => "蒲隆地",
+"布隆迪" => "蒲隆地",
+"希腊" => "希臘",
+"帕劳" => "帛琉",
+"意大利" => "義大利",
+"意大利" => "義大利",
+"所罗门群岛" => "索羅門群島",
+"所羅門群島" => "索羅門群島",
+"文莱" => "汶萊",
+"斯威士兰" => "史瓦濟蘭",
+"斯威士蘭" => "史瓦濟蘭",
+"斯洛文尼亚" => "斯洛維尼亞",
+"斯洛文尼亞" => "斯洛維尼亞",
+"新西兰" => "紐西蘭",
+"新西蘭" => "紐西蘭",
+"格林纳达" => "格瑞那達",
+"格林納達" => "格瑞那達",
+"格鲁吉亚" => "喬治亞",
+"格魯吉亞" => "喬治亞",
+"佐治亚" => "喬治亞",
+"佐治亞" => "喬治亞",
+"毛里塔尼亚" => "茅利塔尼亞",
+"毛里塔尼亞" => "茅利塔尼亞",
+"毛里求斯" => "模里西斯",
+"毛里裘斯" => "模里西斯",
+"沙特阿拉伯" => "沙烏地阿拉伯",
+"沙地阿拉伯" => "沙烏地阿拉伯",
+"波斯尼亚和黑塞哥维那" => "波士尼亞赫塞哥維納",
+"波斯尼亞黑塞哥維那" => "波士尼亞赫塞哥維納",
+"津巴布韦" => "辛巴威",
+"津巴布韋" => "辛巴威",
+"洪都拉斯" => "宏都拉斯",
+"洪都拉斯" => "宏都拉斯",
+"特立尼达和托巴哥" => "千里達托貝哥",
+"特立尼達和多巴哥" => "千里達托貝哥",
+"瑙鲁" => "諾魯",
+"瑙魯" => "諾魯",
+"瓦努阿图" => "萬那杜",
+"瓦努阿圖" => "萬那杜",
+"溫納圖萬" => "那杜",
+"科摩罗" => "葛摩",
+"科摩羅" => "葛摩",
+"科特迪瓦" => "象牙海岸",
+"突尼斯" => "突尼西亞",
+"索马里" => "索馬利亞",
+"索馬里" => "索馬利亞",
+"老挝" => "寮國",
+"老撾" => "寮國",
+"肯尼亚" => "肯亞",
+"肯雅" => "肯亞",
+"苏里南" => "蘇利南",
+"莫桑比克" => "莫三比克",
+"莱索托" => "賴索托",
+"萊索托" => "賴索托",
+"贝宁" => "貝南",
+"貝寧" => "貝南",
+"赞比亚" => "尚比亞",
+"贊比亞" => "尚比亞",
+"阿塞拜疆" => "亞塞拜然",
+"阿塞拜疆" => "亞塞拜然",
+"阿拉伯联合酋长国" => "阿拉伯聯合大公國",
+"阿拉伯聯合酋長國" => "阿拉伯聯合大公國",
+"马尔代夫" => "馬爾地夫",
+"馬爾代夫" => "馬爾地夫",
+"马耳他" => "馬爾他",
+"马里共和国" => "馬利共和國",
+"馬里共和國" => "馬利共和國",
+"方便面" => "速食麵",
+"快速面" => "速食麵",
+"即食麵" => "速食麵",
+"薯仔" => "土豆",
+"蹦极跳" => "笨豬跳",
+"绑紧跳" => "笨豬跳",
+"冷菜" => "冷盤",
+"凉菜" => "冷盤",
+"出租车" => "計程車",
+"台球" => "撞球",
+"桌球" => "撞球",
+"雪糕" => "冰淇淋",
+"卫生" => "衛生",
+"衞生" => "衛生",
+"平治" => "賓士",
+"奔驰" => "賓士",
+"積架" => "捷豹",
+"福士" => "福斯",
+"雪铁龙" => "雪鐵龍",
+"马自达" => "馬自達",
+"萬事得" => "馬自達",
+"拿破仑" => "拿破崙",
+"拿破侖" => "拿破崙",
+"布什" => "布希",
+"布殊" => "布希",
+"克林顿" => "柯林頓",
+"克林頓" => "柯林頓",
+"侯赛因" => "海珊",
+"侯賽因" => "海珊",
+"凡高" => "梵谷",
+"狄安娜" => "黛安娜",
+"戴安娜" => "黛安娜",
+"赫拉" => "希拉",
+);
+
+$zh2HK = array(
 "打印机" => "打印機",
 "印表機" => "打印機",
 "字节" => "位元組",
@@ -8303,7 +7952,318 @@ $zh2HK=array(
 "黛安娜" => "戴安娜",
 );
 
-$zh2SG=array(
+$zh2CN = array(
+"記憶體" => "内存",
+"預設" => "默认",
+"串列" => "串行",
+"乙太網" => "以太网",
+"點陣圖" => "位图",
+"常式" => "例程",
+"游標" => "光标",
+"光碟" => "光盘",
+"光碟機" => "光驱",
+"全形" => "全角",
+"共用" => "共享",
+"載入" => "加载",
+"半形" => "半角",
+"變數" => "变量",
+"雜訊" => "噪声",
+"因數" => "因子",
+"功能變數名稱" => "域名",
+"音效卡" => "声卡",
+"字型大小" => "字号",
+"字型檔" => "字库",
+"欄位" => "字段",
+"字元" => "字符",
+"存檔" => "存盘",
+"定址" => "寻址",
+"章節附註" => "尾注",
+"非同步" => "异步",
+"匯流排" => "总线",
+"括弧" => "括号",
+"介面" => "接口",
+"控制項" => "控件",
+"許可權" => "权限",
+"碟片" => "盘片",
+"矽片" => "硅片",
+"矽谷" => "硅谷",
+"硬碟" => "硬盘",
+"磁碟" => "磁盘",
+"磁軌" => "磁道",
+"程式控制" => "程控",
+"運算元" => "算子",
+"演算法" => "算法",
+"晶片" => "芯片",
+"晶元" => "芯片",
+"片語" => "词组",
+"軟碟機" => "软驱",
+"快閃記憶體" => "快闪存储器",
+"滑鼠" => "鼠标",
+"進位" => "进制",
+"互動式" => "交互式",
+"優先順序" => "优先级",
+"感測" => "传感",
+"攜帶型" => "便携式",
+"資訊理論" => "信息论",
+"迴圈" => "循环",
+"防寫" => "写保护",
+"分散式" => "分布式",
+"解析度" => "分辨率",
+"伺服器" => "服务器",
+"等於" => "等于",
+"區域網" => "局域网",
+"巨集" => "宏",
+"掃瞄器" => "扫瞄仪",
+"寬頻" => "宽带",
+"資料庫" => "数据库",
+"乳酪" => "奶酪",
+"鉅賈" => "巨商",
+"手電筒" => "手电",
+"萬曆" => "万历",
+"永曆" => "永历",
+"辭彙" => "词汇",
+"母音" => "元音",
+"自由球" => "任意球",
+"頭槌" => "头球",
+"進球" => "入球",
+"顆進球" => "粒入球",
+"射門" => "打门",
+"蓋火鍋" => "火锅盖帽",
+"印表機" => "打印机",
+"打印機" => "打印机",
+"位元組" => "字节",
+"字節" => "字节",
+"列印" => "打印",
+"打印" => "打印",
+"硬體" => "硬件",
+"二極體" => "二极管",
+"二極管" => "二极管",
+"三極體" => "三极管",
+"三極管" => "三极管",
+"數位" => "数码",
+"數碼" => "数码",
+"軟體" => "软件",
+"軟件" => "软件",
+"網路" => "网络",
+"網絡" => "网络",
+"人工智慧" => "人工智能",
+"太空梭" => "航天飞机",
+"穿梭機" => "航天飞机",
+"網際網路" => "因特网",
+"互聯網" => "因特网",
+"機械人" => "机器人",
+"機器人" => "机器人",
+"行動電話" => "移动电话",
+"流動電話" => "移动电话",
+"調制解調器" => "调制解调器",
+"數據機" => "调制解调器",
+"短訊" => "短信",
+"簡訊" => "短信",
+"烏茲別克" => "乌兹别克斯坦",
+"查德" => "乍得",
+"乍得" => "乍得",
+"也門" => "",
+"葉門" => "也门",
+"伯利茲" => "伯利兹",
+"貝里斯" => "伯利兹",
+"維德角" => "佛得角",
+"佛得角" => "佛得角",
+"克羅地亞" => "克罗地亚",
+"克羅埃西亞" => "克罗地亚",
+"岡比亞" => "冈比亚",
+"甘比亞" => "冈比亚",
+"幾內亞比紹" => "几内亚比绍",
+"幾內亞比索" => "几内亚比绍",
+"列支敦斯登" => "列支敦士登",
+"列支敦士登" => "列支敦士登",
+"利比里亞" => "利比里亚",
+"賴比瑞亞" => "利比里亚",
+"加納" => "加纳",
+"迦納" => "加纳",
+"加彭" => "加蓬",
+"加蓬" => "加蓬",
+"博茨瓦納" => "博茨瓦纳",
+"波札那" => "博茨瓦纳",
+"卡塔爾" => "卡塔尔",
+"卡達" => "卡塔尔",
+"盧旺達" => "卢旺达",
+"盧安達" => "卢旺达",
+"危地馬拉" => "危地马拉",
+"瓜地馬拉" => "危地马拉",
+"厄瓜多爾" => "厄瓜多尔",
+"厄瓜多" => "厄瓜多尔",
+"厄立特里亞" => "厄立特里亚",
+"厄利垂亞" => "厄立特里亚",
+"吉布堤" => "吉布提",
+"吉布地" => "吉布提",
+"哈薩克" => "哈萨克斯坦",
+"哥斯達黎加" => "哥斯达黎加",
+"哥斯大黎加" => "哥斯达黎加",
+"圖瓦盧" => "图瓦卢",
+"吐瓦魯" => "图瓦卢",
+"土庫曼" => "土库曼斯坦",
+"聖盧西亞" => "圣卢西亚",
+"聖露西亞" => "圣卢西亚",
+"聖吉斯納域斯" => "圣基茨和尼维斯",
+"聖克里斯多福及尼維斯" => "圣基茨和尼维斯",
+"聖文森特和格林納丁斯" => "圣文森特和格林纳丁斯",
+"聖文森及格瑞那丁" => "圣文森特和格林纳丁斯",
+"聖馬力諾" => "圣马力诺",
+"聖馬利諾" => "圣马力诺",
+"圭亞那" => "圭亚那",
+"蓋亞那" => "圭亚那",
+"坦桑尼亞" => "坦桑尼亚",
+"坦尚尼亞" => "坦桑尼亚",
+"埃塞俄比亞" => "埃塞俄比亚",
+"衣索匹亞" => "埃塞俄比亚",
+"衣索比亞" => "埃塞俄比亚",
+"吉里巴斯" => "基里巴斯",
+"基里巴斯" => "基里巴斯",
+"塔吉克" => "塔吉克斯坦",
+"塞拉利昂" => "塞拉利昂",
+"塞普勒斯" => "塞浦路斯",
+"塞浦路斯" => "塞浦路斯",
+"塞舌爾" => "塞舌尔",
+"塞席爾" => "塞舌尔",
+"多明尼加共和國" => "多米尼加",
+"多明尼加" => "多米尼加",
+"多明尼加聯邦" => "多米尼加联邦",
+"多米尼克" => "多米尼加联邦",
+"安提瓜和巴布達" => "安提瓜和巴布达",
+"安地卡及巴布達" => "安提瓜和巴布达",
+"尼日利亞" => "尼日利亚",
+"奈及利亞" => "尼日利亚",
+"尼日爾" => "尼日尔",
+"尼日" => "尼日尔",
+"巴貝多" => "巴巴多斯",
+"巴巴多斯" => "巴巴多斯",
+"巴布亞新畿內亞" => "巴布亚新几内亚",
+"巴布亞紐幾內亞" => "巴布亚新几内亚",
+"布基納法索" => "布基纳法索",
+"布吉納法索" => "布基纳法索",
+"蒲隆地" => "布隆迪",
+"布隆迪" => "布隆迪",
+"希臘" => "希腊",
+"帛琉" => "帕劳",
+"義大利" => "意大利",
+"意大利" => "意大利",
+"所羅門群島" => "所罗门群岛",
+"索羅門群島" => "所罗门群岛",
+"汶萊" => "文莱",
+"斯威士蘭" => "斯威士兰",
+"史瓦濟蘭" => "斯威士兰",
+"斯洛文尼亞" => "斯洛文尼亚",
+"斯洛維尼亞" => "斯洛文尼亚",
+"新西蘭" => "新西兰",
+"紐西蘭" => "新西兰",
+"格林納達" => "格林纳达",
+"格瑞那達" => "格林纳达",
+"格魯吉亞" => "乔治亚",
+"喬治亞" => "乔治亚",
+"梵蒂岡" => "梵蒂冈",
+"毛里塔尼亞" => "毛里塔尼亚",
+"茅利塔尼亞" => "毛里塔尼亚",
+"毛里裘斯" => "毛里求斯",
+"模里西斯" => "毛里求斯",
+"沙地阿拉伯" => "沙特阿拉伯",
+"沙烏地阿拉伯" => "沙特阿拉伯",
+"波斯尼亞黑塞哥維那" => "波斯尼亚和黑塞哥维那",
+"波士尼亞赫塞哥維納" => "波斯尼亚和黑塞哥维那",
+"津巴布韋" => "津巴布韦",
+"辛巴威" => "津巴布韦",
+"宏都拉斯" => "洪都拉斯",
+"洪都拉斯" => "洪都拉斯",
+"特立尼達和多巴哥" => "特立尼达和托巴哥",
+"千里達托貝哥" => "特立尼达和托巴哥",
+"瑙魯" => "瑙鲁",
+"諾魯" => "瑙鲁",
+"瓦努阿圖" => "瓦努阿图",
+"萬那杜" => "瓦努阿图",
+"溫納圖" => "瓦努阿图",
+"科摩羅" => "科摩罗",
+"葛摩" => "科摩罗",
+"象牙海岸" => "科特迪瓦",
+"突尼西亞" => "突尼斯",
+"索馬里" => "索马里",
+"索馬利亞" => "索马里",
+"老撾" => "老挝",
+"寮國" => "老挝",
+"肯雅" => "肯尼亚",
+"肯亞" => "肯尼亚",
+"蘇利南" => "苏里南",
+"莫三比克" => "莫桑比克",
+"莫桑比克" => "莫桑比克",
+"萊索托" => "莱索托",
+"賴索托" => "莱索托",
+"貝寧" => "贝宁",
+"貝南" => "贝宁",
+"贊比亞" => "赞比亚",
+"尚比亞" => "赞比亚",
+"亞塞拜然" => "阿塞拜疆",
+"阿塞拜疆" => "阿塞拜疆",
+"阿拉伯聯合酋長國" => "阿拉伯联合酋长国",
+"阿拉伯聯合大公國" => "阿拉伯联合酋长国",
+"南韓" => "韩国",
+"馬爾代夫" => "马尔代夫",
+"馬爾地夫" => "马尔代夫",
+"馬爾他" => "马耳他",
+"馬利共和國" => "马里共和国",
+"即食麵" => "方便面",
+"快速面" => "方便面",
+"速食麵" => "方便面",
+"泡麵" => "方便面",
+"笨豬跳" => "蹦极跳",
+"绑紧跳" => "蹦极跳",
+"冷盤　　" => "凉菜",
+"冷菜" => "凉菜",
+"散钱" => "零钱",
+"谐星" => "笑星　　　　",
+"夜学" => "夜校",
+"华乐" => "民乐",
+"中樂" => "民乐",
+"屋价" => "房价",
+"的士" => "出租车",
+"計程車" => "出租车",
+"公車" => "公共汽车",
+"單車" => "自行车",
+"節慶" => "节日",
+"芝士" => "乾酪",
+"狗隻" => "犬只",
+"士多啤梨" => "草莓",
+"忌廉" => "奶油",
+"桌球" => "台球",
+"撞球" => "台球",
+"雪糕" => "冰淇淋",
+"衞生" => "卫生",
+"衛生" => "卫生",
+"賓士" => "奔驰",
+"平治" => "奔驰",
+"積架" => "捷豹",
+"福斯" => "大众",
+"福士" => "大众",
+"雪鐵龍" => "雪铁龙",
+"萬事得" => "马自达",
+"馬自達" => "马自达",
+"寶獅" => "标志",
+"拿破崙" => "拿破仑",
+"布殊" => "布什",
+"布希" => "布什",
+"柯林頓" => "克林顿",
+"克林頓" => "克林顿",
+"薩達姆" => "萨达姆",
+"海珊" => "萨达姆",
+"梵谷" => "凡高",
+"大衛碧咸" => "大卫·贝克汉姆",
+"米高奧雲" => "迈克尔·欧文",
+"卡佩雅蒂" => "珍妮弗·卡普里亚蒂",
+"沙芬" => "马拉特·萨芬",
+"舒麥加" => "迈克尔·舒马赫",
+"希特拉" => "希特勒",
+"黛安娜" => "戴安娜",
+"希拉" => "赫拉",
+);
+
+$zh2SG = array(
 "方便面" => "快速面",
 "速食麵" => "快速面",
 "即食麵" => "快速面",
diff --git a/includes/zhtable/Makefile b/includes/zhtable/Makefile
index ddbb7f6941..c63e4db71f 100644
--- a/includes/zhtable/Makefile
+++ b/includes/zhtable/Makefile
@@ -19,7 +19,7 @@ LIBTABE_VER = 0.2.3
 # Installation directory
 INSTDIR = /usr/local/share/zhdaemons/
 
-all: ZhConversion.php tradphrases.notsure simpphrases.notsure wordlist toCN.dict toTW.dict toHK.dict toSG.dict
+all: ZhConversion.php tradphrases.notsure simpphrases.notsure wordlist toHans.dict toHant.dict toCN.dict toTW.dict toHK.dict toSG.dict
 
 Unihan.txt:
 	wget -nc ftp://ftp.unicode.org/Public/UNIDATA/Unihan.zip
@@ -39,7 +39,7 @@ tsi.src:
 
 wordlist: phrase_lib.txt EZ.txt.in tsi.src
 	iconv -c -f big5 -t utf8 tsi.src | $(SED) 's/# //g' | $(SED) 's/[ ][0-9].*//' > wordlist
-	$(SED) 's/\(.*\)\t[0-9][0-9]*.*/\1/' phrase_lib.txt | $(SED) '1,5d' >>wordlist
+	$(SED) 's/\(.*\)\t[0-9][0-9]*.*/\1/' phrase_lib.txt | $(SED) '1,5d' >> wordlist
 	$(SED) '1,/BEGIN_TABLE/d' EZ.txt.in | colrm 1 8 | $(SED) 's/\t.*//' | $(GREP) "^...*" >> wordlist
 	sort wordlist | uniq | $(SED) 's/ //g' > t
 	mv t wordlist
@@ -189,55 +189,65 @@ simp2trad.php: simp2trad1to1.t simpphrases.t
 	cat simpphrases.t >> simp2trad.php
 	printf '";\n$$t=strtr($$str, $$simp2trad);\necho $$t;\n?>' >> simp2trad.php
 
-simp2trad.phrases.t: trad2simp.php tradphrases.t toTW.manual
+simp2trad.phrases.t: trad2simp.php tradphrases.t
 	php -f trad2simp.php | $(SED)  's/\(.*\)/"\1" => /' > tmp1
 	cat tradphrases.t | $(SED)  's/\(.*\)/"\1",/' > tmp2
 	paste tmp1 tmp2 > simp2trad.phrases.t
-	$(SED) 's/\(.*\)\t\(.*\)/"\1"=>"\2",/' toTW.manual >> simp2trad.phrases.t
 
-trad2simp.phrases.t: simp2trad.php simpphrases.t toCN.manual
+trad2simp.phrases.t: simp2trad.php simpphrases.t
 	php -f simp2trad.php | $(SED)  's/\(.*\)/"\1" => /' > tmp1
 	cat simpphrases.t | $(SED)  's/\(.*\)/"\1",/' > tmp2
 	paste tmp1 tmp2 > trad2simp.phrases.t
-	$(SED) 's/\(.*\)\t\(.*\)/"\1"=>"\2",/' toCN.manual >> trad2simp.phrases.t
 
-toCN.dict: trad2simp1to1.t trad2simp.phrases.t
-	cat trad2simp1to1.t | $(SED) 's/[, \t]//g' | $(SED) 's/=>/\t/' > toCN.dict
-	cat trad2simp.phrases.t | $(SED) 's/[, \t]//g' | $(SED) 's/=>/\t/' >> toCN.dict
+toHans.dict: trad2simp1to1.t trad2simp.phrases.t
+	cat trad2simp1to1.t | $(SED) 's/[, \t]//g' | $(SED) 's/=>/\t/' > toHans.dict
+	cat trad2simp.phrases.t | $(SED) 's/[, \t]//g' | $(SED) 's/=>/\t/' >> toHans.dict
 
-toTW.dict: simp2trad1to1.t simp2trad.phrases.t
-	cat simp2trad1to1.t | $(SED) 's/[, \t]//g' | $(SED) 's/=>/\t/' > toTW.dict
-	cat simp2trad.phrases.t | $(SED) 's/[, \t]//g' | $(SED) 's/=>/\t/' >> toTW.dict
+toHant.dict: simp2trad1to1.t simp2trad.phrases.t
+	cat simp2trad1to1.t | $(SED) 's/[, \t]//g' | $(SED) 's/=>/\t/' > toHant.dict
+	cat simp2trad.phrases.t | $(SED) 's/[, \t]//g' | $(SED) 's/=>/\t/' >> toHant.dict
+
+toTW.dict: toTW.manual
+	cat toTW.manual | $(SED) 's/ //g' | $(SED) 's/\(^.*\)\t\(.*\)/"\1"\t"\2"/' > toTW.dict
 
 toHK.dict: toHK.manual
 	cat toHK.manual | $(SED) 's/ //g' | $(SED) 's/\(^.*\)\t\(.*\)/"\1"\t"\2"/' > toHK.dict
 
+toCN.dict: toCN.manual
+	cat toCN.manual | $(SED) 's/ //g' | $(SED) 's/\(^.*\)\t\(.*\)/"\1"\t"\2"/' > toCN.dict
+
 toSG.dict: toSG.manual
 	cat toSG.manual | $(SED) 's/ //g' | $(SED) 's/\(^.*\)\t\(.*\)/"\1"\t"\2"/' > toSG.dict
 
-
-
-ZhConversion.php: simp2trad1to1.t simp2trad.phrases.t trad2simp1to1.t trad2simp.phrases.t toHK.manual toSG.manual
-	printf '<?php\n/**\n * Simplified/Traditional Chinese conversion tables\n' > ZhConversion.php
+ZhConversion.php: simp2trad1to1.t simp2trad.phrases.t trad2simp1to1.t trad2simp.phrases.t toCN.manual toHK.manual toSG.manual toTW.manual
+	printf '<?php\n/**\n * Simplified / Traditional Chinese conversion tables\n' > ZhConversion.php
 	printf ' *\n * Automatically generated using code and data in includes/zhtable/\n' >> ZhConversion.php
 	printf ' * Do not modify directly!\n */\n\n' >> ZhConversion.php
-	printf '$$zh2TW=array(\n' >> ZhConversion.php
+	printf '$$zh2Hant = array(\n' >> ZhConversion.php
 	cat simp2trad1to1.t >> ZhConversion.php
 	echo >> ZhConversion.php
 	cat simp2trad.phrases.t >> ZhConversion.php
 	echo ');' >> ZhConversion.php
 	echo >> ZhConversion.php
-	printf '$$zh2CN=array(\n' >> ZhConversion.php
+	printf '$$zh2Hans = array(\n' >> ZhConversion.php
 	cat trad2simp1to1.t >> ZhConversion.php
 	echo >> ZhConversion.php
 	cat trad2simp.phrases.t >> ZhConversion.php
 	echo ');' >> ZhConversion.php
 	echo >> ZhConversion.php
-	printf '$$zh2HK=array(\n' >> ZhConversion.php
+	printf '$$zh2TW = array(\n' >> ZhConversion.php
+	$(SED) 's/\(.*\)\t\(.*\)/"\1" => "\2",/' toTW.manual >> ZhConversion.php
+	echo ');' >> ZhConversion.php
+	echo >> ZhConversion.php
+	printf '$$zh2HK = array(\n' >> ZhConversion.php
 	$(SED) 's/\(.*\)\t\(.*\)/"\1" => "\2",/' toHK.manual >> ZhConversion.php
 	echo ');' >> ZhConversion.php
 	echo >> ZhConversion.php
-	printf '$$zh2SG=array(\n' >> ZhConversion.php
+	printf '$$zh2CN = array(\n' >> ZhConversion.php
+	$(SED) 's/\(.*\)\t\(.*\)/"\1" => "\2",/' toCN.manual >> ZhConversion.php
+	echo ');' >> ZhConversion.php
+	echo >> ZhConversion.php
+	printf '$$zh2SG = array(\n' >> ZhConversion.php
 	$(SED) 's/\(.*\)\t\(.*\)/"\1" => "\2",/' toSG.manual >> ZhConversion.php
 	echo >> ZhConversion.php
 	printf ');' >> ZhConversion.php
diff --git a/includes/zhtable/toTW.manual b/includes/zhtable/toTW.manual
index f7118679e3..a1639f7f84 100644
--- a/includes/zhtable/toTW.manual
+++ b/includes/zhtable/toTW.manual
@@ -161,8 +161,8 @@
 圭亞那	蓋亞那
 坦桑尼亚	坦尚尼亞
 坦桑尼亞	坦尚尼亞
-埃塞俄比亚	衣索匹亞
-埃塞俄比亞	衣索匹亞
+埃塞俄比亚	衣索比亞
+埃塞俄比亞	衣索比亞
 基里巴斯	吉里巴斯
 基里巴斯	吉里巴斯
 塔吉克斯坦	塔吉克
diff --git a/languages/classes/LanguageZh.php b/languages/classes/LanguageZh.php
index db913b50e6..9209db8e80 100644
--- a/languages/classes/LanguageZh.php
+++ b/languages/classes/LanguageZh.php
@@ -9,18 +9,22 @@ class ZhConverter extends LanguageConverter {
 	function loadDefaultTables() {
 		require( dirname(__FILE__)."/../../includes/ZhConversion.php" );
 		$this->mTables = array(
-			'zh-cn' => new ReplacementArray( $zh2CN ),
-			'zh-tw' => new ReplacementArray( $zh2TW ),
-			'zh-sg' => new ReplacementArray( array_merge($zh2CN, $zh2SG) ),
-			'zh-hk' => new ReplacementArray( array_merge($zh2TW, $zh2HK) ),
-			'zh' => new ReplacementArray
+			'zh-hans' => new ReplacementArray( $zh2Hans ),
+			'zh-hant' => new ReplacementArray( $zh2Hant ),
+			'zh-cn'   => new ReplacementArray( array_merge($zh2Hans, $zh2CN) ),
+			'zh-tw'   => new ReplacementArray( array_merge($zh2Hans, $zh2TW) ),
+			'zh-sg'   => new ReplacementArray( array_merge($zh2Hans, $zh2SG) ),
+			'zh-hk'   => new ReplacementArray( array_merge($zh2Hant, $zh2HK) ),
+			'zh'      => new ReplacementArray
 		);
 	}
 
 	function postLoadTables() {
-		$this->mTables['zh-sg']->merge( $this->mTables['zh-cn'] );
-		$this->mTables['zh-hk']->merge( $this->mTables['zh-tw'] );
-    }
+		$this->mTables['zh-cn']->merge( $this->mTables['zh-hans'] );
+		$this->mTables['zh-tw']->merge( $this->mTables['zh-hant'] );
+		$this->mTables['zh-sg']->merge( $this->mTables['zh-hans'] );
+		$this->mTables['zh-hk']->merge( $this->mTables['zh-hant'] );
+	}
 
 	/* there shouldn't be any latin text in Chinese conversion, so no need
 	   to mark anything.
@@ -31,13 +35,13 @@ class ZhConverter extends LanguageConverter {
 	}
 
 	function convertCategoryKey( $key ) {
-		return $this->autoConvert( $key, 'zh-cn' );
+		return $this->autoConvert( $key, 'zh' );
 	}
 }
 
 
 /* class that handles both Traditional and Simplified Chinese
-   right now it only distinguish zh_cn, zh_tw, zh_sg and zh_hk.
+   right now it only distinguish zh_hans, zh_hant, zh_cn, zh_tw, zh_sg and zh_hk.
 */
 class LanguageZh extends LanguageZh_hans {
 
@@ -45,13 +49,15 @@ class LanguageZh extends LanguageZh_hans {
 		global $wgHooks;
 		parent::__construct();
 
-		$variants = array('zh', 'zh-cn', 'zh-tw', 'zh-sg', 'zh-hk');
+		$variants = array('zh', 'zh-hans', 'zh-hant', 'zh-cn', 'zh-tw', 'zh-sg', 'zh-hk');
 		$variantfallbacks = array(
-			'zh'    => 'zh-cn',
-			'zh-cn' => 'zh-sg',
-			'zh-sg' => 'zh-cn',
-			'zh-tw' => 'zh-hk',
-			'zh-hk' => 'zh-tw'
+			'zh'      => 'zh-hans',
+			'zh-hans' => 'zh-cn',
+			'zh-hant' => 'zh-tw',
+			'zh-cn'   => 'zh-hans',
+			'zh-sg'   => 'zh-hans',
+			'zh-tw'   => 'zh-hant',
+			'zh-hk'   => 'zh-hant'
 		);
 
 		$this->mConverter = new ZhConverter( $this, 'zh', $variants, $variantfallbacks );
@@ -84,12 +90,12 @@ class LanguageZh extends LanguageZh_hans {
 				"/([\\xc0-\\xff][\\x80-\\xbf]*)/e",
 				"' ' .\"$1\"", $string);
 
-        //always convert to zh-cn before indexing. it should be
-		//better to use zh-cn for search, since conversion from
+        //always convert to zh-hans before indexing. it should be
+		//better to use zh-hans for search, since conversion from
 		//Traditional to Simplified is less ambiguous than the
 		//other way around
 
-		$t = $this->mConverter->autoConvert($t, 'zh-cn');
+		$t = $this->mConverter->autoConvert($t, 'zh-hans');
 		$t = parent::stripForSearch( $t );
 		wfProfileOut( $fname );
 		return $t;
diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 1d107a5209..5db88dba44 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -2541,11 +2541,13 @@ To disable showing a particular link, set it to 'disable', e.g.
 'variantname-zh-sg' => 'disable',
 Variants for Chinese language
 */
-'variantname-zh-cn' => 'cn', # only translate this message to other languages if you have to change it
-'variantname-zh-tw' => 'tw', # only translate this message to other languages if you have to change it
-'variantname-zh-hk' => 'hk', # only translate this message to other languages if you have to change it
-'variantname-zh-sg' => 'sg', # only translate this message to other languages if you have to change it
-'variantname-zh'    => 'zh', # only translate this message to other languages if you have to change it
+'variantname-zh-hans' => 'hans', # only translate this message to other languages if you have to change it
+'variantname-zh-hant' => 'hant', # only translate this message to other languages if you have to change it
+'variantname-zh-cn'   => 'cn', # only translate this message to other languages if you have to change it
+'variantname-zh-tw'   => 'tw', # only translate this message to other languages if you have to change it
+'variantname-zh-hk'   => 'hk', # only translate this message to other languages if you have to change it
+'variantname-zh-sg'   => 'sg', # only translate this message to other languages if you have to change it
+'variantname-zh'      => 'zh', # only translate this message to other languages if you have to change it
 
 # Variants for Serbian language
 'variantname-sr-ec' => 'sr-ec', # only translate this message to other languages if you have to change it
diff --git a/languages/messages/MessagesJa.php b/languages/messages/MessagesJa.php
index c2f417344b..9caec14589 100644
--- a/languages/messages/MessagesJa.php
+++ b/languages/messages/MessagesJa.php
@@ -1769,11 +1769,13 @@ To disable showing a particular link, set it to 'disable', e.g.
 'variantname-zh-sg' => 'disable',
 Variants for Chinese language
 */
-'variantname-zh-cn' => '簡体（中国）',
-'variantname-zh-tw' => '正字（台湾）',
-'variantname-zh-hk' => '正字（香港）',
-'variantname-zh-sg' => '簡体（シンガポール）',
-'variantname-zh'    => '無変換',
+'variantname-zh-hans' => '簡体',
+'variantname-zh-hant' => '正字',
+'variantname-zh-cn'   => '簡体（中国）',
+'variantname-zh-tw'   => '正字（台湾）',
+'variantname-zh-hk'   => '正字（香港）',
+'variantname-zh-sg'   => '簡体（シンガポール）',
+'variantname-zh'      => '無変換',
 
 # Metadata
 'metadata'          => 'メタデータ',
diff --git a/languages/messages/MessagesYue.php b/languages/messages/MessagesYue.php
index 8913e4450b..8a8df5d77e 100644
--- a/languages/messages/MessagesYue.php
+++ b/languages/messages/MessagesYue.php
@@ -264,7 +264,7 @@ $messages = array(
 'qbspecialpages' => '特別頁',
 'moredotdotdot'  => '更多...',
 'mypage'         => '我嘅頁',
-'mytalk'         => '我嘅對話',
+'mytalk'         => '我嘅討論',
 'anontalk'       => '同呢個 IP 傾偈',
 'navigation'     => '導航',
 
@@ -1981,11 +1981,13 @@ To disable showing a particular link, set it to 'disable', e.g.
 'variantname-zh-sg' => 'disable',
 Variants for Chinese language
 */
-'variantname-zh-cn' => '簡體（中國大陸）',
-'variantname-zh-tw' => '正體（台灣）',
-'variantname-zh-hk' => '繁體（香港）',
-'variantname-zh-sg' => '簡體（新加坡）',
-'variantname-zh'    => '無變換',
+'variantname-zh-hans' => '簡體',
+'variantname-zh-hant' => '繁體',
+'variantname-zh-cn'   => '簡體（中國大陸）',
+'variantname-zh-tw'   => '正體（台灣）',
+'variantname-zh-hk'   => '繁體（香港）',
+'variantname-zh-sg'   => '簡體（新加坡）',
+'variantname-zh'      => '無變換',
 
 # Variants for Serbian language
 'variantname-sr-ec' => '斯拉夫易卡語',
diff --git a/languages/messages/MessagesZh_hans.php b/languages/messages/MessagesZh_hans.php
index 848976186c..909ce0fffc 100644
--- a/languages/messages/MessagesZh_hans.php
+++ b/languages/messages/MessagesZh_hans.php
@@ -1914,11 +1914,13 @@ To disable showing a particular link, set it to 'disable', e.g.
 'variantname-zh-sg' => 'disable',
 Variants for Chinese language
 */
-'variantname-zh-cn' => '大陆简体',
-'variantname-zh-tw' => '台湾繁体',
-'variantname-zh-hk' => '香港繁体',
-'variantname-zh-sg' => '新加坡简体',
-'variantname-zh'    => '不转换',
+'variantname-zh-hans' => '简体',
+'variantname-zh-hant' => '繁体',
+'variantname-zh-cn'   => '大陆简体',
+'variantname-zh-tw'   => '台湾正体',
+'variantname-zh-hk'   => '香港繁体',
+'variantname-zh-sg'   => '新加坡简体',
+'variantname-zh'      => '不转换',
 
 # Metadata
 'metadata'          => '元数据',
diff --git a/languages/messages/MessagesZh_hant.php b/languages/messages/MessagesZh_hant.php
index 8f8924f59f..560df0ff80 100644
--- a/languages/messages/MessagesZh_hant.php
+++ b/languages/messages/MessagesZh_hant.php
@@ -1886,11 +1886,13 @@ To disable showing a particular link, set it to 'disable', e.g.
 'variantname-zh-sg' => 'disable',
 Variants for Chinese language
 */
-'variantname-zh-cn' => '大陸簡體',
-'variantname-zh-tw' => '台灣繁體',
-'variantname-zh-hk' => '香港繁體',
-'variantname-zh-sg' => '新加坡簡體',
-'variantname-zh'    => '不轉換',
+'variantname-zh-hans' => '簡體',
+'variantname-zh-hant' => '繁體',
+'variantname-zh-cn'   => '大陸簡體',
+'variantname-zh-tw'   => '台灣正體',
+'variantname-zh-hk'   => '香港繁體',
+'variantname-zh-sg'   => '新加坡簡體',
+'variantname-zh'      => '不轉換',
 
 # Metadata
 'metadata'          => '元數據',
diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index e8c3ebec38..568e6e11d7 100644
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -1789,6 +1789,8 @@ $wgMessageStructure = array(
 		'bad_image_list',
 	),
 	'variantname-zh' => array(
+		'variantname-zh-hans',
+		'variantname-zh-hant',
 		'variantname-zh-cn',
 		'variantname-zh-tw',
 		'variantname-zh-hk',